Introduced separate variable for custom form class generation
updated conflicts