Database structure updated
Current working solution