Move where protos get added and change logic to allow option to not add extra elements on repeatables, even when empty