Improve DB shells