Added @JoinColumn annotations to have Hibernate generate foreign keys
rather than intersection tables