Updated to exclude archives