Added basic matching and database file