Add more functionality to export