Minor changes
Combined <template>/8/16/32/64 bit in one module with defines