Added basic multi client support