rebuilt model with @ManyToOne entity foreign key references refactored model