improve exports, v0.6.2