Session: Break up add_decoder()