Add support for lists