Changes for production
Improve DB Performance