Refactor AuraFormTrait