UPdate to new  resource structure.