Copying over Plugin changes from FileSystem prototype
Todo