Applied fixes on Data model classes