Refactor context instantiation in ManuscriptStorage