Preparing to upgrade to Space API 0.13