Code Refactor-
Changed Lists to hash maps at most places