Revert "Addressing breaking IFileSystem changes"

This reverts commit cfd5630cf21d4d17ce9dc39554d57f5abb88a8a0.
Add support for roles
Revert "Revert "Addressing breaking IFileSystem changes""

This reverts commit 5a815c13a9e4d9af5c220f4d041412d9bfaa1bb0.