arch change, not complete
Merge branch 'arch_change' of https://github.com/narwalsandeep/cloud-manager into arch_change