Add changes made for Aura. WIP.