BET-25 Adding parsing fields