Refactor items stuff
Add payload store format and refactor type into payload type