Internal restructure of module working only for boolean type, yet.