WA18: Update clinker facade