Refactor identifier, no more model category