Improve database