Made bulk export interface more flexible