Added goal states listener