Added support for client contacts