Refactor adding SI metadata

Change-Id: I676e52a89ce132ac3b56336b5ce9d38762d4a3bc