replace manager with finders and commands