Are working on the Query widget and adding support for validation and parsing