Added support for tap encoding.