Add namespace support to trigger