Use an Item class instead of hashes