Entry Level Logging

Following the basic idea in last commit's comment.
Using old map rather than hashmap will speed up the merging when
committing.