Improvement on the databse