HNA refactoring phase #1