Added Router decoders