Added Proxy Classes
Updated other Classes for 1.6