Added support for adding clients