Adding few more logics to Hash tree