Done subQueries with discriminator