Generalize proxy, added cs checks