Reference refactor to have attribute separately