Adding list and set support