Add environment support