Added support for UMD