Updated package to support folder checks