Refactor schemas for other item type