Schema Management refactoring (part 2)..