Added more exports