2.1.6 - Add MPV support