partial changes to improve pojo generation