refactor and jbuilder update for StreamRecord2