SpaceAPI support

See the one commit.