Some major cleanup and integration of the spaceapi schema