Database improved