[FEATURE] More partials => less duplicity