Improve Database Awareness