Little modifications in server