Added Server and Storable classes