Database schema improved