MAL-108. Added classes for all fields