Refactored managers using dql fit classes