Fixes for Generating the class object