Enhancement to cloneable framework

Change-Id: Ic8297c2cdde3f9ac379fc1f22e3fed9d436f2f94