Improved database