Moved 1-1 matches over to maps