Revamp handling of equipped items