[V2] Resourcified custom fields

rebased #659.