refactor to hlte-common changes