Separated database definitions to be able to check all columns exists
Bug fixes