Add module support