Refactored PRS OOP