Adds support for basic spots features