Changed for proxy