1. Add Environment Switching