Change how extra_attributes are declared

This will allow us to test boolean additional fields, since Shams
enforce uniqueness (and you run out of unique booleans very fast)