Changed the various items in to type Item