Adds UMD support