Added -server and -client modules