Add to permitted attributes
Merge branch 'fix-permitted-attr'