Adding Afero support