wrap permission set classes to allow automatic serialization of jackson ...

Merging the changes for serialization to work in my master branch