Added mapping data and paths