Modified decoder class