More simple and effective top-level declarations by name search
2 more indices not needed anymore