SeriesResolver refactoring