Simplify environment management