added more environment options