Refactor proxy objects