Add Env-Based config TODO