Add support for RFC6536 extensions