Additional changes to support state server.