Updated most classes to now use 'protected' properties