Add support for starred folders