BET-32 Add getters and setters