Introduce service to abstract redundant logic. Make this also work for alternative override storages, not just the one in core.