Revamp to the category parameter.