Added changes to cater for Common servers