Changes for PROD env