Added local environment support