BAM-26 add support for custom activities