Added database folder + listener