Modified resource model: steps towards removing resource resolvers.