temp commit of code generation
moved previously auto-generated class members into class to avoid __dict__ update