Updated to allow for partials and helpers