Started refactoring for single client på subscription