Migrated to UMD #ifdef