add option to restrict indexes for classes during selection, change to schema