Added getters/setters and made class follow Model Class Diagram