Extract PO catalog managment to its own class. Reduce duplicated code and apply separation of concerns