Improve DB interaction