Shuffled FS interface, added some more concepts.