Reworked PO/POT classes to respect strict standards