Added trigger/hook calls
updated to new spec