Database improved a bit