Add entity fields to form mapper