- simplify database part