UMD-ify the lib