Better solution for orders saving