Make a big modify on HLib interface