Update to support UMD