Another wave of adding properties for export params