BAM-95 refactored to extract common field into a new base class