Fixed daily year data bug
Added Goal support