Update spec, add HTML attributes