Switched to queue impl for OnCompleteListener