Add restrictions and rename parameters to meet the one written in report cc8b2eb tnk2908 commited on Jul 20