Fix broken build, change the way we expose data