Add additional checks for file/folder creation and use