Changes for server env
Changes for server env