Fixes #84 Enhance native query to be added to batch manager