Include ID in embedded objects. Close #33