Added fillMap function