Refactoring Item Creation handler to be able to update entries
Merging develop.