Added base for server and client