Change ArrayList for the "database" to a Map