Refactor variables to attributes::default