Enhance FS for embeds