Refactoring with multi game support