Improved filesystem classes