Add getters and setters on client side objects
Better structure of server code