Further enhancements to embedded handling now that we have Table/Column
structure