Refactor proxy usage