Add additional environment support