Feature/mcda integration