* Added support for the declarotions and name search