Add attribute-type and other changes