add support for very basic query building