Named entity consumption refactored. Several additional refactorings performed