Clean up task ordering
Add type parameters to output metrics