Add List, Set and Map types

Can't do this in 5.3.