Update changelog
Update attributes to concatenate classes