Refactored trigger interface
renamed