Add more permitted attributes

And specs.