Extracting AccessorLocator to separate objects
Update docs