Added the extra queries