Small additions, MPV support