Add formatted version of smokes with extra data, and update raw version