Changed how we do attributes