Add more environments