remove handler case from hybrid-dictionary, add pre computed distirbution capability