Fix after merge and import
Fix import for set_attributes