DB improved, RI added