added server and user system