Add getters and setters to clean up interface