Embedding for Folders improved!