Added fallback folders and other improvements