Updated references to Item & Room constructors