Added basic client and server entities