Updated for helpers, and categories