Added module support to cloned