Improve PAO regex