Import/export moved to separate module