Improved - CustomTypeGenerator - object types generation