Storage configurable
Change tooo heavy query method