Less hardcoded item actions, more futureproofing