Improved database design