Refactor to use builders for trigger/run methods

Fixes #2