Added referenceId handling for server.