Added correct queries into BD for new tables