Updated queries