Changes to support PER encoding support