Added more feedback to the mapping, loading process.
Solved merge conflict.