Rework UMD. Related to #58