Implement embedded object typing
Resolve merge conflict