Added classes for tasks and categories