Added support for public clients