Task queue changes
Task factory