Add mapping section and more queries