Adding support for ISO CALM FAST and ETSI GeoNetworking