WIP: Missed a few fields in pod refactor