Updated to use cloud namespace etc.