Improved po integration