Changes to support inList items