Improved database managment