Added changes for secoddary server.