Added support for the 'client' attribute