Added @Embeddable