Added cloning to facilitate immutability patterns