Added endpoint information to environment
Updated with a slightly more crash safe editor engine