Recovered from ill-advised refactoring
Eliminated BaseItem