Refactor Item model