Add AES
Drop 3.0 support
Add scope fixes