Database Identification Improvement

Database Identification Improvement