made refactoring over admin manager