AES based MAC support added