Attempt to add module support