Added lists support