KD: Made Address as embeddable
KD: Fixed ids