Changes to support the C5156