Updating with the new indexes and modules