Changes for production database