Added Category and Task classes