Added support for 8 and 16 byte keys in addition to 24 byte keys.