#42 Replace JoinColumn with Column annotation