Updates to server functions