Added proxy classes
Changed intialisation phases