Updated docs and allow for listening for specific events only