Refactored methods, added simple NSU resolver