Added support for triggers