Removed the use of deep copy