Added bullet and query optimization