Update for new classes and item handling