Enhance on() method a bit