Social security refactor

See [SEC-2102](https://jira.springsource.org/browse/SEC-2102)