Added import of Identifier and Trigger
Merge pull request #690 from flashcactus/master

Need to import Identifier and Trigger