refs #677 - added handling of @Id annotation