Enable fast_finish support