Refactor pivot fields