Add proxify and unproxify