Pure preparation refactoring for functionality extension in next MR. No user facing or behavioral changes