Added support for Runtime: Flush & Finish