Move listener to init file