WIP: Missed a few fields in pod refactor

We don't need to do this yet - anyway, this is something that should be handled by the api client without the client knowing about it.  We should have an internal api object that represents this logic and then it should get run through conversion when we need it.