More tvb refactor