Improve mapping from last commit