Added: Fix AVP properties in the dict format