Implemented new client/server model