Adding missing getters and annotations