Modification for server use