Making work with latest resourcet