Improve database fetch