Added nested partials support