Update to SWT Handler with tests

Supports multiple claim types.