Adding 3gpp support