some changes in the Proxy-Class