add support for module handling