Changed Clould class