Added more decoding features