Added support for cloning