Adding support for partials