Added Utils and Query