Refactor GPO creation to follow protocol spec