Updated to include subdirectories