Updated indexing to work with new way of doing sources.