Move listener to Generic Module