Adding commonJS wraper support