Improved user export