Made changes to forecast domain model