Move the item creation to the right place