Updated all models to support new proxy