Better compatibility with core for trigger / filter