Refactor status uniqueness