[maint] Improved tasks