Add trigger; Limit scope of public API