@IndexEmbedded(depth) functionality introduced + structure reorganized