ACT-1454 Support custom comment types