u/smm/DM-198: Add support for match tables and query validation