Use modern syntax
Fixes issue with class generation