Adds custom environment support