Adding FileSystemWrapper solution