Add new fields to dict. Little improvements to PAP parser