Simplify proxy code