Removed PoParser dependency