Fix support for @helpers and @functions