Updated to support onCompletion()