Combined the create and upgrade helpers