Started adding support for lists