Fixed issue in persisting embeddable class