Additions to index & config