Moved indexers into library