Untested changes to introduce support for xts(aes)