Issue #2 - Add *Kind* to the Task