Improved lazy listeners
Version 1.1.0
Pulled lazy listeners from instantiated listeners