#33: Improve public fields definition.