Add UsernameToken support