Added support for user triggers