Add map functionality
Add list and add flows