Added DB and Task classes