Adding support for public files