Refactor identifier member to id