Adding support for folder subscribers