Adding per-type partials and stuff