Added database tasks
Enhanced models