Improved Database structure