Modifications to allow existence of additional attributes.