Add ability to add triggers. CR pending by Jeff.