Changed the ProxyCreator a little bit