Added Cloud Services and other changes