added entity queries