Updated utility to match final server spec