Modified database and added match result management