Improved UMTS support