Modified Decoder Class