Define Entities in persistence xml and correct JoinColumns definition on relationships