Moving to new UCP definition