Added custom environment class