We have some usability update for db