Change to generate single mapping file
Add todo