Support for 5G