Fix for getter and setter in Organization

Fix getter and Setter