Add List, Set and Map types