Added support for new component fields.