Adding better clone support and validations

Change-Id: I49264355315148a106842be9717a700d1df8edd9