Updating standards to match XH Generator