Updated for BIN export