Added Server and Storable classes to client