Added more completion handlers