Added ability to define AVU queries in JSON