Improve database management