Added native query bundle and generated source