Adding support for lists