Additional encoding and TODO.