Add code for list and map