Added constructors, getters and setters to model classes