Changes to support V1.6