Add support for  and
Add support for UMD