Added Model, Server and Observer classes