Add item populate logic updated