[#24] Added additional queries