Added more queires