Increased visibility of a few fields to allow extension.