Moving Observer class from client.helpers to client