ITTE-1164 Added multiple client support.

Signed-off-by: Simeon Iliev <simeon.iliev.bg@gmail.com>