Add isProd flag and corresponding logic