New dictionary format and query syntax