Improving resolver; adding content-stub