Fixup of db and added directed_id
Fixup of db and added directed_id