adding support for different namespace resolution policies
removing old implementation