Modified private fields to be 'protected' to ease customization by
subclassing
Regenerated CS with current SDK