Added use_context to partial