Converted all the data structures to list
changed logger logic