Added support for concatenated codes