Add support for Riap 1.2