Minor tweaks
Migrated to a task queue instead of deferred