-changes to support new exports