Metods
Refactor and Manager implementation