Changes for new server