Added Cloud Network support
fixed merged issues