class generation tweaks