add module support. Untested yet.