Added v1.7 changes - lists