Better FS link support