Modified database with match management