Removed hardcoded values in export tool