Added types as a query option