[SERVDEV-39], [SERVDEV-40] Major refactoring of PRS