Updated with new resources