Code refactored, added map and list assertation