Refactoring Trigger & Item (again)