Simplified the proxy classes.