Added class members to FileSystem