Added ClientCredentials and Password Grants