Updated goal model for new schema