Major refactoring for future integration of baselines