Extract item creation to its own module
Refact