Improve implementation on partials.