Comment out a couple of messages no longer in use.
Add the actual role mapping.
Make the Subject read only so we can be sure it's contents can not be changed.
Make the Subject readOnly as it is wrapped in the Caller - we want to be sure it's contents will not change (not that they should anyway by the time this point is reached)