improved export & added importHandler