Added modules for client and server