Optimize PAP policy constructor with builder