Subqueries added