changed some classes definitions.
adding new functionality in Server in progress...