Reworked the cloning inside the variable object to be more consistent