Closes #184 - Make listeners singletons