Padding + AES_wrapper added