add support for 'on' and 'before' features