added UMD support