Adding basic support for Targets and Triggers