Refactor Context Data Hierarchy BIT #2001