Refactor ProxyForm