7916: separate fields to proper child class