Updated Goal model