Add support for partials