adding more granularity to environment selection