Improve export of model