production env support added