Added some cloning to module