Adding core
Fixed error in listener