Latest changes for mdget conversion