Refactored SplitsManager