Added Elective Hierarchy and filtering based on the hierarchy