Made some refactoring over admin manager