Added optional arguments to listeners