AutoCreator upgrade