Updated with configurable environment settings