Removed unnecessary batch index provider
Fixed to use Factory, removed Batch code