Added free functions to listeners