Added support for 128-bit keys