Add modularized tasks to ammend previous commit