Add: embed associations and correct missing field def keyword