Updated for categories and helpers, etc.