Refactor h7 export