Allow onFinish override