WCM-60 Add flush method and basic infrastructure