Fixed exposing objects to the client (without touching the views)