Initial support for RFC 6603