Feature/extend aura