Switch to CAF for Display variant