Cloning is now macro based