Removed hid dependence on Analyst