Adding production vs development environment support