Adding in module support