Adds support for spacers