Goal class updated