Explorer refactor for identifiers and subjects