better db mapping.