Combine create and upgrade helpers