Re-construct categories
Update