added base classes to Server