Changed to UMD spec