Updated for new resource system