Adding getters and setters