Improve proxy