Refactored class Fields to a better API.