Add working query system