added export and manual mapping