Adding native support for modules