Changed to use attributes rather than property objects for id and
idtype.