Adding uniqueVersion support