Added typedef, operational data, choice for match, ...