Removed old import
Added missing @Embeddable