Add Fast Finish Support