Added a completion handler