Added event functions to options and better integration with addTag