Added missing server code