Update spec's goals
Use the attribute system