Add support for Spaces.