Enable enhanced inner classes
Add validation for inner classes
Fix injection of Beans