Refactor PAO implementation