Add getters and setters