WIP: Missed a few fields in pod refactor

We're not ready to do this - it means clients can start using this and we don't want that yet.