Updated to work with the item event framework