Updated for server use