Update to match Cosmic 0.0.4