Added support for decode-it