Move everything to use multi task for consistency