Fixed item creation and adding further options