Completed Query validation method and added method chaining support for all classes