Avoid concurent modification on list and map