Client Manager refactored and Finders removed