Now works with strata