Updated issue with environment enum