#311 : Update embeddable to use equals and hashcode