Tweaking type & extend helpers