Promote apiVersion to a full-fledged option