HexManager refactoring