I have updated the code here https://github.com/linkedin/venice/pull/471 There will be some tests to add in order to make the Code Coverage checks happy. @Felix GV you can already take a look when you have time, I don’t expect other changes.