Adding getters to implementation