Reworked database definitions to get just ONE query