added common field support