Add missing getters and organize imports