Add error macro, change export/import functions.