Replace system_category with generic_category