Export more stuff
1.3.1-beta4