Added options to on() method