Added support for partials