Subject:Removed hashmap dependency from list mode

Description:
1. Removed hashmap dependency from list mode