Add support for components inside of a space