[IMP] Added TODO for new DB