Add modifications for the live server