Optimized BPV and RiskManager for Performance