Osc Manager refactoring