[PATCH 1/2] Use the new pkg module, to avoid having 2 tasks