Refactoring of code, new util class added IndexedLinkedHashMap.java