Changes for production site