Remove call to main queue and handle using GCD entirely.
Support new spec.