Merged changes and few validation