Server changes added