Use update_context where appropriate