Update cloud to follow spec closer