Added getters and setters and updated constructor with new fields.