Changes to use the Spring @Id Annotations.