Added folder protection