Refactor to KeycloakSession