Refactor done. Need to improve flow. Added 3GPP AVPs