Updated to include all resources