Added DEPT and COMPANY measures