Rework on parsing units conf

No match.