Switch to mdp composition