Fixed services and resources to support Long keys