Updated the Database structure for it to fully support joins