Add default environment support