Added polymorphic name resolution