Added goal class