Updating the IndexTool to work with two-dot-o and Core Persistence.