Changed export API