Add more goal information