Adds environment support