[WIP] Export improved