added matching for environmental variables