Move to jelly-proxy