Adding support for space tokens