Markup under feature flag